fixed merge resolution error from last merge