merging master till signup with validation