Fix trailing comma and comment whitespace
Fix scrobbleshift include post merge conflict and stop console.log