Trying to fix broken merge