fix location create action
fix conflict
fix