Fixed Move and Copy
Fixed Merge Conflict
Fixed copy's name
fixed conflict