File change without merging