restored correct file permission to files modified in last merge