merging Martin Manov layout