Adjust execute code to handle output from multiple previous execution lines
Split out diff function into own class
Add methods for checking merges and detecting conflicts