one by one error corrected by @emiln
fix merge