removed git merge leftovers