appended 2 to 1, #1
fixed merge