More Merge issues resolved