conflicts while updating