Bugs resolving
Bugs detection
merged