rebase script added
merge fix