changed the merge code again :(