various interface things
dealt with conflicts