publication access added
publication access continue
conflict resolved manually
removed code at conflict added again manually
Merge remote-tracking branch 'origin/asadi'