fixing merge... round two