fixed merge bug

autowired mappers