Fixing missed header error during merge