towards merging code