passed all tests until nest
solved a small conflict