first steps towards merge functionality