public class MyClass { public void SpinThePedals(float howMuch); public void SlamTheBrakes(bool tooLate); <<<<<<< LEFT public int SpinThePedals(); ||||||| BASE ======= public void SpinThePedals(); >>>>>>> RIGHT public void SpinThePedals(bool forever); }