styling, login, logout
confict resolution layout.erb