File Renaming Issue

I have recently changed the file names for some of my files 'pages/file-name.blade.php' and when I attempt to rename those files, I am getting this error.

"Someone edited the file the same time you did. Please check out the file and make sure your changes will not unintentionally remove theirs."