public private users complete
fix merge conflict