Solve Composer conflicts