although the 500th anniversary of christopher columbus ' discovery of the new world is still two years away , the city and county are engaged in what one official calls a `` protocol war '' over control of los angeles ' celebration .