Fixed merge conflict
Minor bugfix