Fixed some merge conflict.

Signed-off-by: Esteban Torres <me@estebantorr.es>