Added a merge migration (effect of a rebase)
Added a merge migration (effect of a rebase)

swcarpentry/amy,pbanaszkiewicz/amy,wking/swc-amy,swcarpentry/amy,wking/swc-amy,pbanaszkiewicz/amy,swcarpentry/amy,wking/swc-amy,vahtras/amy,vahtras/amy,wking/swc-amy,vahtras/amy,pbanaszkiewicz/amy