Trying to complete merge, no conflict found.