continue to update mergesame