Merging bugs fixed