Merge issues resolved