Skeleton of conflict resolution.
Setting modtime upon file receipt.
Exchanging newest version of conflicting files.
Fixing argument parsing.