removed kris merge break