Fix Sonar issue
Fix conflict