Fix compiler errors after merge
1 file changed