v.1.0.7 clean up the conflicted copies