Fixed codepro issues
Fixed merge issue