Fix Conflict.