added string converter functions (like concat)
merged conficts