Minor changes
Fix merge conflict
debugging