fixed watchlists not going to database
fixing merge conflicts