add editor new view
rm default in route/*
fix merge conflict file