Cannot merge because there are uncommitted changes. Commit or undo your changes before merging again. See the Output window ...