I'm now using a GD editor for coding (with syntax checking) and also using notepad++ for its handy file comparion add on. With this I can pick up the merge problems quite quickly but there were still a lot of them moving into this latest version. Lines of code were being lost and changes not put into the combined code. I'm finding that the best way to get the merge to behave is to put an in obvious but cosmetic change (like the order of items in a big var statement) that wakes up the merge function and makes it notice your real changes nearby. I still have to find each failed merge though before I can fix it.