first commit ChronoShareEdit
Resolve Merge Conflicts