color palette
commit after conflict resolve
conflict resolve GestureActivity
conflict resolve GestureActivity