resolved merge conflict
resolved merge conflict

SamReha/dictator1,kthtes/dictator1,SamReha/dictator1,SamReha/dictator1,kthtes/dictator1,kthtes/dictator1,kthtes/dictator1,kthtes/dictator1,SamReha/dictator1,SamReha/dictator1