Add short url
Merge short url with master