view templating
editing views
fixed merge conflicts