starting on display
fixing merge error