OTS proposes income tax and national insurance merger