fixing merge conflicts
fixing merge conflicts: