solve inconsistency at Natrans
fix: function_compose
fix: line positions
Merge branch 'master' of github.com:mathink/Cat_on_Coq