Remove generated new from repo and add to post-merge script