this is only a test of binary asset conflicts in various git clients