fix merge conflict correctly this time