diff --git a/system-test/storage.ts b/system-test/storage.ts
index 7fcfc6a488..0b32192ac5 100644
--- a/system-test/storage.ts
+++ b/system-test/storage.ts
@@ -1847,16 +1847,12 @@ describe('storage', () => {
 
       it('should not download from the unencrypted file', done => {
         unencryptedFile.download(err => {
-<<<<<<< HEAD
-          assert(err!.message.indexOf([
-=======
           if (!err) {
             done(new Error('Expected an error.'));
             return;
           }
 
-          assert(err.message.indexOf([
->>>>>>> TypeScript stuff.
+          assert(err!.message.indexOf([
             'The target object is encrypted by a',
             'customer-supplied encryption key.',
           ].join(' ')) > -1);