add testing and merges