removed code to check

I will use the heroku rails console to set a default for everyone
removed conflict