If you're having problems with merge read this

[colbyd]

Thanks i will do that to! It fixed it for me also.