fixed weird merging issues that appeared somehow. inventory isn't working, don't know why, i'll fix it tomorrow