removed HEAD conflict tag