Fixing incorrect merge