issues resolved
conflicts
small changes