removed unecessary functions, fixed merge conflict