Merge pull request #1604 from thatleeguy/develop

Fixing typo in error for multiple migration conflict.