Remove merge conflict from commit introduced by sascala.
Remove merge conflict from commit introduced by sascala.

meln1k/marathon,meln1k/marathon,natemurthy/marathon,janisz/marathon,natemurthy/marathon,Caerostris/marathon,Caerostris/marathon,mesosphere/marathon,mesosphere/marathon,janisz/marathon,meln1k/marathon,meln1k/marathon,yp-engineering/marathon,meln1k/marathon,gsantovena/marathon,guenter/marathon,janisz/marathon,Caerostris/marathon,guenter/marathon,guenter/marathon,gsantovena/marathon,titosand/marathon,janisz/marathon,janisz/marathon,ss75710541/marathon,ss75710541/marathon,guenter/marathon,ss75710541/marathon,titosand/marathon,mesosphere/marathon,natemurthy/marathon,Caerostris/marathon,gsantovena/marathon,mesosphere/marathon,timcharper/marathon,mesosphere/marathon,timcharper/marathon,gsantovena/marathon,gsantovena/marathon,Caerostris/marathon,guenter/marathon,yp-engineering/marathon,timcharper/marathon