adjusted conflicting files