Fix for Failed merge