Files that could potentially cause conflicts

Aspect Item Parser and World