merge conflict resolving
fixed the merge fix.