Merge conflict in readers controller