Remove the conflicts from cherry pick
Signed-off-by: PipelinerArd <kristoferard@gmail.com>