Fix merge for interpolation.cpp

Should fix #6