fixed changelog merge conflict version 2.5
fixed changelog merge conflict version 2.5

dankpapaya/RobotFactory,dankpapaya/RobotFactory,dt1001/RobotFactory,dt1001/RobotFactory,dt1001/RobotFactory,dankpapaya/RobotFactory