conflict folder logic wip, deserialization logging wip