fixing merge conflicts

added new files.