Spanish translation with flag
Fixed conflict