Git Laboratory This is a feature branch. <<<<<<< HEAD This will also cause a conflict This will cause a conflict conflict-branch