fixed address mapping problem
resolve merge