Resolving conflicts hackily -- not sure why branches aren't syncing