public class Adder { public int add(int a, int b) { return a + <<<<<<< LEFT 1 ======= 2 >>>>>>> RIGHT ; } }