manually fix merge conflicts