fixing error during merge