added views and resolved conflicts