pull from github
merge conflicts
for styling