merging fixes