Remove debugging statements
Merge conflict