resolving merge conflicts for #375