disable modeline
change trunk for conque term
fix conflict