Syncing fixes

This release improves handling of certain source syncing cases.

Features:

• More options for sorting the site list

Fixes:

• Error when connecting a GitHub branch with an integer as a name.
• Better error reporting for merge conflicts.