davesantos Fix merge conflict