fix for incorrect merge