minor style change
adaptation
adapation 2
merge
merge2