merge src updates