add a file just for testing auto-merging functionality