Fixing failed conflict merge in 652a8eab42e9668b36e7f79a560159695801538a