update mint
try to resolve conflicts

Conflicts:
	paper-building/Firstdraft_combined.lyx