add CONFLICTS
Merge pull request #297 from reallyenglish/tomoyukis

add CONFLICTS