removed some uneeded code
resolve merge conflicts