- conflict method name changed
- conflict2 method name changed
- conflict2 method name changed