Git Error You Have Not Concluded Your Merge