fixed mainmap partial conflict