Some changes to have less conflicts in sonar