fix conflicts
finish typing up proofs