Solved some issues from sonar
Fix merge conflicts