resolved broken code (damn)
merge conflict resolved