fix merged issues
fixed it