remove conflict code