updates May 6
config routes
resolve conflict