fixed git conflict
Merge branch 'DragonVirus-master'
fixed conflict