fixed merge goof