BUG: Corrected merge problem