Pushing changes (hoping merge conflicts don't occur)