Project page re-write
trying to resolve conflict
resolving conflict