Fixes Conflict