somewhere on the right path?
resolved a conflict?