Git You Have Not Concluded Your Merge