resolve again from master