Fixed compiling errors due to merging conflicts