merging issues resolved