fix rails g issues
fix conflicts