resolution of merge conflicts in likes controller