Hey > Should be fixed now. > On further thought, perhaps a good idea would be to introduce server side push hooks that ensure that no merge markers are left ? Cheers Rohan Garg