resolve composer conflicts