added conflict comment
attempt to resolve conflict