fixed merge errors from last commit :D