Fixing composer conflicts.