fix indent and remove unneeded merge file