fixed previous conflict stuff