add documentation step for migrating database
fix conflicts in readme