removed debugging code
Conflict resolution