making conficlting changes