removed merge code