conflicts solved...