retarget to main, revert relevant files