HW2 part 2: Added feature merge article, scenario 1 and 2 passing green