discussion at like half a page
fixed merge conflict