remove merge tags in gnublin.* files