Re-add conflicting files