report things
merge fix