merged changes that hasn't been committed but been modified since