holy fuck merge conflict