remove changes merge file