Arch files
conflict resolution