commiting domain ownership file
 fixed conflict