remove error from previous conflict