Checkstyle coding
Merge conflicts in Rolit.java