Resolve conflict code