Displays working properly.
merger conflict avoided