[merge] resolve conflict