colorization

repair

merging 1

merging 2