Resolve merge error from test merge