First version
solve conflicts