rename locur -> locu
fix conflict in README