Merge collision fixes