Add merge processing #264