Commit local changes prior to conflict resolving
Update fabfile from upstream again
Update translations and press subscription view