merge stash into feature
stub methods in comments controller