try to keep one migration per pull request - its easier to debug. You can edit/add/remove migrations before they get merged to master so no worries to do that.