got merge up working