Fixed the merge tool including extra stuff