gello: fix mismerge

Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
9 files changed