changes to master to resolve merge conflict (i hope)