Removed all conflicts