still not merging