radical restructuring
resolved conflicts