created a new package: items and created abstract class item and a class extends item: food
created more items for the items class and are working on the implementation in player
working on player and the items if calls
resolving conflicts after restoring old version
resolved conflicts and restored the attack() method: half finished methods in player need finishing