Conflict
Updated conflict.