Maki Majima: Migration files and Git do not mix

Two conflicting schema changes never produce a merge conflict, because they live in separate files. Being stored in Git is not the same as being managed by it.