Resolved conflicts with MHacks branding
Fixed conflicts