fixed most conflicts. Where did the filter file go :(