Fix merged Bug