add file with conflict