Worked on discerning between changes.
Handled merges.