adding missed merge