First Commit. Shortener is available open souce
Resolve conflict