BSed user feedback
attempt at resolving conflicts