views folder
resolving merge conflict by deleting ours