default_layout
fix merge
added gitcommit