Several conflict corrected