[TASK] Resolve conflic