Fixes build error caused by merge