second attempt at merging