modified locally
file edited and merged locally