Lampara finished
Resolving conflicts