merge some code