Fix merge conflict 3