admin close to end lex
fix merge