fixed delete issue which has created in resolved conflict