fixing conflicts and minor location changes