stuff
conflicts
more conflicts
map resizes