Fixed conflicts

here we go git!