made profile modal work
fixed merge conflict
fixed another merge conflict