cleaning up my horrible merges
fixing bad merge on suggestions controller