merged and bugs