marker popup
resolved conflicts