webyast-base.changes - properly resolved conflicts