removing trace statements
merging