issues resolved with merge