Merging issues resolved