changed to octocat
merge fixed