properly fix merge conflict