fixing merging issue
fixing merging problems