graphics and stuff
report stuff
merge conflicts report