Sync before pull
Sync before pull
Committing after fixing conflict
All hud resizes now saved.