Fix issue with parsing merge commits
Remove unused file