changes made without merging