Schema was modified when I merged latest changes and created database.yml file