ran migration to remove animals column from users
removed my_animals column from users schema
removed merge conflict in schema