add log4j2
update log and log for search
resolve conflicts