Fixed one merge goof