test merging again