Got Rid of some Conflicts