Fix merge conflict?