My changes cannot overwrite yours. Merge errors will appears in this case and this errors should be properly resolved. 
But I cannot do it from my side now, because your changes are not in repo yet.