There can't be merge conflicts