removed extra variable
fixed conflict ata
Merge branch 'Oscar' of https://github.com/jrsescon/AffectDDATopDown into Oscar