Attemp to merge server branch