junit other branch without merge conflict