merge conflict? needs fixing