Grigory changes - 190113
Example
Ultra merge with space deletion
Merge with grigory's files with special char at the end of the lines