Nothing exciting
Resolving conflicts
Updated things to use a simple definition of where to write the raw data