Fixed missing id from bad merge