Add -conflict postfix for files modified externally