Deleted some left over piece of code from a conflict