REALLY fixed the merging issues. Hopefully they will be completely resolved.