fixed merge issue
merging in changes from external project