merge migrations so tests are running faster

The merge should be done by version if possible