remove rebase merge conflict files
shorten discount key to 6 characters

[fixes #54561940]
display field_with_errors elements inline-block on login page

[fixes #54561956]
skip validations on password reset

[fixes #54561950]
show presenter emails and proposal id in proposal list

[fixes #54562004]
increase number of results returned by pagination

allows reviews to search on a page more easily [fixes #54561992]
only load regular prices during price management

added eager loading for the conference items and regular prices
created a regular prices association for eager loading
[fixes #55367858]