Acting on conflicts

Should have been done earlier