Altered Working

Fixed merging error.