more merge conflix, also skeleton for dropdown