Update cheatsheats
Resolve conflicts