remove conflict header