resolving merge conflict in #1614