Adding todays banana
Solving conflict