testing conflicting pushes