minor merge mistake