Bug Fixing Merge problem