Works better if merge conflics in file has been resolved...
Merge branch 'master' of https://github.com/pwnies/pwntools
Merge branch 'master' of https://github.com/pwnies/pwntools
Merge branch 'master' of https://github.com/pwnies/pwntools