stil restructuring
resolved conflicts