Add models named user_cookies and bonus_cookies. Have modified associations
Conflict resolved