adding pre-merge conflict versions of Ratna's files