Add merging strategy to avoid merge issue while assembling and exlude some conflicting dependencies