Fixed some stuff we don't want conflicts do we !