Added test case for conflict finder + minor bug fix in service