another mergefix