Greg/merge record collision fix