Work on Trannoy reform
Fix conflict