Updated in remote branch "test"
version 1
version 2
resolved conflict