wrote test for following fhellows
erge conflicts