Removed more weird git merge noise.