* solve merge conflict