fix commit error
fix signup conflicts
fix signup conflicts