added user repos
fixed merge conflict