Merging issues resolved
Fixed more merging issues