fixed unknown bugs :D
fixed sql queries bug
resolved conflicts