resolved conflict in raports controller