Resolved conflict
fixed merge