Fix all conflict in asset