fixed merge layout problems