Removed merge conflict leftovers
Minor bugfix