commit before merge, make sure everything is up  to date