add conflicts resolution for mono