Please, commit your changes or stash them before you can merge. Aborting