implememt mv
fix merge conflict