Merge collision changes