#60 | flattening commits