tweaked look
resolved conflict