go to type families for extra clarity (for me anyways).
merge diverging files