resolve conflicting files