commit
fixed merged conflict
fixed routes