publication access added
conflict resolved manually