Changing Sources
removed merge conflict