fixed merge resolution mistake