works
solve
Merge branch 'ikhsaniks-master'
works
sql
tes
Merge remote-tracking branch 'upstream/master'