update
resolve merge conflicts
initial qcrack