Checkstyle fix
Checkstyle fix + resolve conflicts