merged conflicts, add new methods