removed some left over merge info