Removed merge conflict garbage