removed a memory leak
resolved conflicts