Added 2 ints to start merge conflict process