fixing merge errors, again.