fix merge error n sonar items