1 server master
2 server freeman
3 master pc
jo master
using theirs
after merge
freeman first
using mine
final master