second try at merging and conflicts support