report stuff
merge conflicts resolved