debug nullpointer
merge conflicts
getInputStream Method