Wops still finding errors from merging