Still fixing merge errors.

This time, it's .properties being removed.