Delete file_conflict_with_develop_03.rb