fix of some conflicting files