Fix conflict on different setFeedrate Method
Merge cause by false commit