Delete file_conflict_with_develop_02.rb