some issues resolved
conflict removed