checkstyle
conflict resolution