removed merge conflict leftovers