Conflicts fixup

Credits to Mahdi-Rom for AbsListView fix