Junit testcases
resolved the conflict