Corrected CMalkelists.txt files

These had some unresolved conflicts.