Resolved conflicts
Format function added.
String function added.