Trying to get our two branches synced