Removed Conflicts