Removed duplicate create_sites migration. Fixed merge problem with routes.