resolved: merge conflicts