hohohoho
resolve conflict, hash