Amarinder merge his party with BJP