fixed a small aliasing bug
fixed merge conflict