Featurev0301efotopoulouCreateConflict: add text