Fix error during merge