Mateusz merge