Fixed merge conflict problem