now we have two files
two functions
thre functions
all conflicts resolved
all fixed now
Merge branch 'develop'