Tag: resolve conflict git