fixing a merge with force.