finished write, made changes
finished write, fixed merge conflicts