Detected conflict rssolution.
Refactored method names to words.