Added Help View Content
Fixed Merge Errors