Fix weird git merge thing.