task #0002 Conflict resolve