Fixing compilation issues caused by the merge conflict