Fixing a bug in manual_write-non_conflict + setSet conflicts