Added commit

Signed-off-by: Paolo Ibarra <jpibarra1130@gmail.com>
Fixed merge conflict

Signed-off-by: Paolo Ibarra <jpibarra1130@gmail.com>