resolving merge conflict, Ivan's modifications showing up here as a result