Rename file_conflict_with_develop_02.rb to file_conflict_with_develop_01.rb