fixing merge
adding assembly plugin back in