hectorr
committed
on 27 Jun 18
Fix conflict leftovers