Merge conflicts due to restructuring
more merge conflicts