Add conflict.txt! This file is used to test the confict.