finished layout
completed merge