sandraj pull request 

i took off the conflicts again, i made sure there weren't anymore left.