fixes

Author: raboid

test/fixtures/synchronized.js

@@ -1,4 +1,4 @@
-module.exports = ({ author_association = 'COLLABORATOR' }) => ({
+module.exports = ({ author_association = 'COLLABORATOR' } = {}) => ({
   name: 'pull_request',
   payload: {
     action: 'synchronize',

test/index.test.js

@@ -129,16 +129,14 @@ comments:
     labels: 
       - duplicate
 
-<<<<<<< HEAD
 merges:
   - action: delete_branch
-=======
+
 commits:
   - action: label
     pattern: merge when passing
     labels:
       - merge when passing
->>>>>>> use synchronize, add unit tests, add to default config
 
 default:
   close:
@@ -493,7 +491,7 @@ describe('Bot', () => {
     })
 
     test('Will take action on a maintainer commit message', async () => {
-      await robot.receive(synchronizedPayload({}))
+      await robot.receive(synchronizedPayload())
 
       expect(github.issues.addLabels).toHaveBeenCalledWith({
         number: 4,