minor bug fix
fixing merge conflicts