ugh
undoing org mode damage
fix merge conflict