remove confict code and add map click method