resolve conflict code.
resolve conflict code.