merge boulevard changes