In which year, Haryana was merged with Punjab in British India