merging bugs fix