Incorrect merge revert for SatStepperBegin/.cproject