jp's breakup and makeup
fixing git