Fix merge conflict again