fixed stupid
code user needs to add to create conflict
new master
fixed stupid again