Fix conflict tests