update render and view
fix merge conflict