oskite: fix conflicts that was caused by the prior merging.
oskite: fix conflicts that was caused by the prior merging.

mertaytore/koding,drewsetski/koding,gokmen/koding,usirin/koding,drewsetski/koding,alex-ionochkin/koding,rjeczalik/koding,jack89129/koding,acbodine/koding,andrewjcasal/koding,acbodine/koding,koding/koding,gokmen/koding,andrewjcasal/koding,szkl/koding,mertaytore/koding,szkl/koding,drewsetski/koding,drewsetski/koding,gokmen/koding,acbodine/koding,sinan/koding,sinan/koding,usirin/koding,rjeczalik/koding,alex-ionochkin/koding,szkl/koding,drewsetski/koding,acbodine/koding,usirin/koding,sinan/koding,andrewjcasal/koding,acbodine/koding,gokmen/koding,sinan/koding,kwagdy/koding-1,szkl/koding,usirin/koding,koding/koding,gokmen/koding,cihangir/koding,szkl/koding,sinan/koding,alex-ionochkin/koding,gokmen/koding,mertaytore/koding,szkl/koding,koding/koding,kwagdy/koding-1,rjeczalik/koding,andrewjcasal/koding,andrewjcasal/koding,mertaytore/koding,jack89129/koding,rjeczalik/koding,gokmen/koding,koding/koding,rjeczalik/koding,drewsetski/koding,cihangir/koding,usirin/koding,kwagdy/koding-1,koding/koding,kwagdy/koding-1,cihangir/koding,mertaytore/koding,usirin/koding,cihangir/koding,alex-ionochkin/koding,jack89129/koding,cihangir/koding,drewsetski/koding,rjeczalik/koding,kwagdy/koding-1,koding/koding,kwagdy/koding-1,usirin/koding,koding/koding,jack89129/koding,drewsetski/koding,sinan/koding,kwagdy/koding-1,kwagdy/koding-1,alex-ionochkin/koding,andrewjcasal/koding,rjeczalik/koding,cihangir/koding,jack89129/koding,andrewjcasal/koding,szkl/koding,acbodine/koding,acbodine/koding,jack89129/koding,szkl/koding,alex-ionochkin/koding,sinan/koding,jack89129/koding,mertaytore/koding,rjeczalik/koding,alex-ionochkin/koding,sinan/koding,alex-ionochkin/koding,mertaytore/koding,cihangir/koding,koding/koding,andrewjcasal/koding,cihangir/koding,mertaytore/koding,gokmen/koding,jack89129/koding,acbodine/koding,usirin/koding