accidentally lost information in the merge