153 Add merge conflict
Prior to this commit things were ok. This commit creates conflict.