Build beta with 4.3, fix some merge problems