fix to broken merge