fixes & merger