added cookie, save users neighbourhood ids in my_hoods
resolved conflicts