Change gradient
Fix merge conflict