Resolving merge conflicts. #428