dunno what i did but didnt commit...
merged changes
stuff's not working
merged conflicts
merged more changes