cleaning up merge conflict and putting back my add fav col work in progress