update file status
resolved conflicts