conflict resolutions for prior commit. went with Luis's