removed pending conflict