Removed some console logs, adjusted the timer settings for auto-sync, fixed bug with sync pull conflicts.

Fixed a bug where history panel was popping up on sync pull conflicts.
Updated i18n for auto-sync.
Adjusted timer settings for auto-sync so that it is actually 5 min, 15 min, and 30 min.