fixed merge conflict fabrication