Fixed Conflicts should be good.