fixed stashed conflicts and first-time server bug for user permissions