fixed some things
fixed merge conflict
fixed another merge conflict