This is very likely to cause merge conflict, it is for the greater good Discuss at: http://meta.discourse.org/t/enough-with-the-sample-files/10351 From now on we use ENV to customise if needed