getting ready to pull
fixing merge problems
working encounter aop with usage log