Why did you modify the migration yourself again? 
This branch can not be merged till all files are from the db owner himself.