remove changes intended for different branch