fixed merge error for origin