Burn Down changes
Fix conflict JARE