Green background when in Live mode
Fix merge conflict