removed issues from the last merge