fixing merge goof