testing conflicting commits with joe