merge master with resources