Add station new/edit page
fix merge conflict