add devise filter to profile, removed from beers
add user likes beer action
resolve conflict