modified inventory window
resolved merge conflicts
resolved conflict issues
working skills window