Testing merge with branch_1 and master