deleted files not needed and reformated the edit on child
Merge origin/master
 reformated the edit on child