d
solved sync conflicts