Changes to app html erb
Fixed merge conflicts