fixing compilation error due to merge issues