Removed Git Merger Error