fixed merge v2