Merge conflict problems
Add user test notes and fix merge problem