finished history for network eng more merge stuff
merge issues