merge general done