Bug fixed. Wrong namespace after merge