move files after merge
fix merge errors