Update reame for conflicts resolution