resolved conflict with the answers