Deleted lame conflicting files