README changes for clarity. Updated known conflicts