fixed conflict
got question working again
merging