root/olares3: links for gitconflict