finished configuration, fixed auth issue
fixed merge conflict