updating things again without conflict hopefully