Fix conflict problem