fixed for last bigsnakey
conflict fixes