Fixed the "merge" mess and created new subsections