Unresolved Conflicts in app/scripts/console.js and app/scripts/player.js