Fixed weird git merge error.