Fix merge nil case