strange things
fixing conflic