fix merge conflict 2