If you're having problems with merge read this

Printable View