Fix merge conflict in ArticleDAOImpl.java