Stricter checkstyle rules.
resolved merge conflicts