Fix remaining merge conflicts and CodePro violations