fixed the codeigniter googleMap error
fixed merge error