Re: [ADM] Please try to avoid merges in the git tree