fix merge issue/bugs with last pull request