ugh, delayed merge