remove leftover merging code
merge