Merged with git