Fix merge conflict problem