- Merge bug fixed