Manually fixed conflict with Chris files.