Add SiteMVC merge conflict files "bin, Content"
Add merge conflict files "packages"