removed merge conflict garbage values