add traffic model
removed conflict