Merging things

Signed-off-by: luislukas <luislukas@gmail.com>