remove git merge artifact