bug solved
bug solving
Conflicts resolved