Merging.
Fix some docblocks alignment