changed stuff.txt
fixed merge conflicts