Feature ql(language model)

Fixed conflict...