user interface started
Resolving conflicts
Adding ved's application.erb