Lot's of fixes and changes, Added new Key Resources
Have a happy Conflict!