tried to fix up conflics but fucked it even more