Fix merge conflict 2