complete merge recovery with Rons last commit manually merged