correction fatal error
merge