hopefully only commit from server
merge resolved by hand