merge
after merge
add attachment mapper for elasticSearch