addressing merge conflict by re adding file