work in progress
Display merge conflicts in ui with buttons
rm .map again