commiting
fixed merge conflict
called user data from github's api