merge code
working merge code