fixing stuf

just merge it. plz!