Disable timestamp type tags by setting update_deploy_timestamp_tags to false
Resolve conflicts and merge pull request #2.