Fix checkstyle after merge conflict