another conflicting commit