Fixed MErge Conflict, added gradient

Signed-off-by: Ray-Christian <cjray89@gmail.com>