fixed some merge problems in init