add if mac/win? statements in copy commands to avoid script crash on windows
Merge conflict resolution