hectorr
committed
on 31 Jan 20
Remove conflict leftovers