code conformance after merging pull request