Cleanup merge conflict tags