resolved conflict
fixed merge conflict