Change in show publish to private
fix comflicts
fix conflicts