new :D
solve conflic2