Append conflict
Resolve conflict