fixed location load issue
fixed the muthafucking merge conflicts