merge dist from mvc (local) branch