testing for conflict by asdfasf
improved conflicts handling