Fixed uncompleted conflict