added previously conflicting files