Add conflict section to composer