removed the is-was conflict