commit your changes or stash them before you can merge
commit your changes or stash them before you can merge