Fixed incorrectly resolved conflict