fixed cursor building issues
fixed conflict
some shit