MBH: cleaning up site
MBH: fixing conflicts