clone change
clone change, conflicts resolved