forgot to perform confliction clean up