Need to find a merge and diff tool now 😄