merging just noticed changes