Corrected merge problems, and memory leak