sorry for the inconvenience.
As far I could interprete the topic's title, I assume you have problems with the merge. Everything you need to know about the merge is mentioned here: Merge FAQ
Here a quote out of that topic regarding your problem:
If this couldnt fix your problem, please let it me know.