Changed align_CDS output file
Solved conflicts