spacebar now writes the file
merge conflicts