fix for broken merge