BZ-0000:Merging issue