Remove forgotten merge conflict stuff