rename folder-copy to folder-copycom - conflict fix