done add location
resolved conflicts in files