Fixed bug
Conflict resolving