Add func2
Add func3
Merge confilts
rename