Fix merge conflicts ; remove test* and try* patches and add them to .gitignore