fixing some problems with the merge