merge some changes