Fixed merge conflict bug.