Removed debug log
fixed conflicts