fixed merge issue with package comment