Fixed minor issues in coding rules
Fixed merge conflicts
Fixed merge conflicts